merge
authorStefano Stabellini <sstabellini@xensource.com>
Wed, 11 Aug 2010 14:56:01 +0000 (15:56 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Wed, 11 Aug 2010 14:56:01 +0000 (15:56 +0100)
commite6bde27c8258693f726858a46eaa72acffdfcf22
tree5b6232595b0cd2fcf3737f8a73544276eb80ec5b
parentca095c507e36c27ea1cdc89493624a5c5d3eeabe
parentffb79cfc81d87c70a7aceed1385530b83c1c9b8f
merge